Fix a couple of problems in the TPM backend driver.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
index 24216605be68c3bfe7e8b124502b24eb116550f8..4d38953444577d157f6402d0e23085087bd0a99c 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
+++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
@@ -745,9 +745,9 @@ failexit:
 
 static void __exit tpmif_exit(void)
 {
+       exit_tpm_xenbus();
        cleanup_vtpm();
        tpm_private_put();
-       exit_tpm_xenbus();
        gnttab_free_grant_references(gref_head);
 }
 

diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
index be4988239ba9b30bc03542dae98a33082420463a..0992ad962d5286c34ecbf5d4e39dc7beb384c94d 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
@@ -179,7 +179,7 @@ void __init tpmif_interface_init(void)
                                         0, 0, NULL, NULL);
 }
 
-void __init tpmif_interface_exit(void)
+void __exit tpmif_interface_exit(void)
 {
        kmem_cache_destroy(tpmif_cachep);
 }